Auto merge of #1483 - tamird:rustup, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 5 Apr 2015 06:21:52 +0000 (06:21 +0000)
committerbors <bors@rust-lang.org>
Sun, 5 Apr 2015 06:21:52 +0000 (06:21 +0000)
Passes `make test` locally. r? @alexcrichton


Trivial merge